Merge upstream changes #2291
Merge upstream changes #2291
Conversation
…ter (mastodon#25693) Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
…ete protocol values (mastodon#25886)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream
Port 9f078e2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 4534498 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 20e85c0 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port e0d230f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream renamed an initial state parameter, where we had extra ones. Renamed as upstream did. - `app/workers/feed_insert_worker.rb`: Upstream wrapped database query in a block, we had extra database queries because of the DM timeline. Moved everything in the block.
… in web UI Port ceeb2b8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes.
…n web UI Port 338a0e7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream
Port c27b82a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port af54bf5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port ea10feb to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how releases are tagged, we don't have releases. Ignored the changes
Port 1392f31 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.
There was a problem hiding this comment.
Looks overall okay to me.
I'm just very confused by ceeb2b8 and what it's trying to achieve. It supposedly allows to see the explore page even when trends are disabled, but still all links navigating to it are hidden? I fail to see the point, unless I'm missing something.
My understanding is that it changes the UI to not hide |
Oooooooh I see. |
Merge upstream changes up to 7e54a30
Conflicts
None
Ported changes
Merge upstream changes up to 41a5055
Conflicts
app/serializers/initial_state_serializer.rb:Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
app/workers/feed_insert_worker.rb:Upstream wrapped database query in a block, we had extra database queries because of the DM timeline.
Moved everything in the block.
Ported changes
Postponed changes (TODO)
Skipped changes
Merge upstream changes up to 610cf6c
Conflicts
app/models/trends.rb:Conflict due to glitch-soc's code splitting trends mailing depending on type.
Ported upstream's changes.
Ported changes
Merge upstream changes up to ea10feb
Conflicts
None
Ported changes
Merge upstream changes up to 8e0fd2d
Conflicts
.github/workflows/build-image.yml:Upstream changed how releases are tagged, we don't have releases.
Ignored the changes
Ported changes
Postponed changes
Merge upstream changes up to 82e477b
Conflicts
db/migrate/20180831171112_create_bookmarks.rb:Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
Ported changes
None
Additional changes